Skip to content

CASSANDRA-19931: Support OR operator and sub-conditions in query builder #1965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 2 commits into
base: 4.x
Choose a base branch
from
Draft

CASSANDRA-19931: Support OR operator and sub-conditions in query builder #1965

wants to merge 2 commits into from
+368 −1

Conversation

lukasz-antoniak
Copy link
Member

Fix CASSANDRA-19931.

Example OR operator:

assertThat(
        selectFrom("foo")
            .all()
            .where(Relation.column("k").isEqualTo(literal(1)))
            .and()
            .where(Relation.column("l").isEqualTo(literal(2)))
            .or()
            .where(Relation.column("m").isEqualTo(literal(3)))
            .orderBy("c1", ASC)
            .orderBy("c2", DESC))
    .hasCql("SELECT * FROM foo WHERE k=1 AND l=2 OR m=3 ORDER BY c1 ASC,c2 DESC");

Example sub-condition:

assertThat(
        selectFrom("foo")
            .all()
            .where(Relation.column("k").isEqualTo(literal(1)))
            .and()
            .where(
                subCondition()
                    .where(Relation.column("l").isEqualTo(literal(2)))
                    .or()
                    .where(Relation.column("m").isEqualTo(literal(3))))
            .orderBy("c1", ASC)
            .orderBy("c2", DESC))
    .hasCql("SELECT * FROM foo WHERE k=1 AND (l=2 OR m=3) ORDER BY c1 ASC,c2 DESC");

Yuqi-Du
Yuqi-Du reviewed Oct 3, 2024
View reviewed changes
...uilder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectOrderingTest.java
.where(Relation.column("m").isEqualTo(literal(3))))
.orderBy("c1", ASC)
.orderBy("c2", DESC))
.hasCql("SELECT * FROM foo WHERE k=1 AND (l=2 OR m=3) ORDER BY c1 ASC,c2 DESC");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understand correctly, this a 'recursive' building.
So we can have

SELECT * FROM foo WHERE k=1 AND (l=2 OR m=3 OR (q=4 AND p=5 )) ORDER BY c1 ASC,c2 DESC"

Or other complex nested logical query?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you are correct. I have made one of the queries more complex.

Yuqi-Du
Yuqi-Du reviewed Oct 3, 2024
View reviewed changes
...uilder/src/test/java/com/datastax/oss/driver/api/querybuilder/select/SelectOrderingTest.java
.orderBy("c1", ASC)
.orderBy("c2", DESC))
.hasCql("SELECT * FROM foo WHERE k=1 AND (l=2 OR m=3) ORDER BY c1 ASC,c2 DESC");
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible we can add some more complex logical query in tests.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced last test to be more complex. Above tests also verify backward-compatibility of current default AND operator.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@Yuqi-Du Yuqi-Du Yuqi-Du left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lukasz-antoniak @Yuqi-Du